Auto merge of #1154 - tshepang:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 13 Jan 2015 17:36:14 +0000 (17:36 +0000)
committerbors <bors@rust-lang.org>
Tue, 13 Jan 2015 17:36:14 +0000 (17:36 +0000)
commitb6afc819db9ebc250ddb36d8b62438c838dd0f95
tree7f7122adf563a1c2fe564d5dda52acdc8ccdf78c
parentcff6aadb5ee1eea987bc7461d364c1f426406d99
parent2a2bfd2309559564111360763aeec7b14042635a
Auto merge of #1154 - tshepang:patch-1, r=alexcrichton